From c31d4ef23cb9a260b3605a3d07f166b8e862686b Mon Sep 17 00:00:00 2001 From: "robertlipe@gmail.com" Date: Tue, 18 Feb 2014 05:30:13 +0000 Subject: [PATCH] Bump version numbers. Ritual sacrifice for windows build. Move to Qt5, which doesn't support object trees below the source. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4753 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/GPSBabel.pro | 2 +- gpsbabel/configure | 31 +++---- gpsbabel/configure.in | 18 ++-- gpsbabel/gbversion.h | 4 +- gpsbabel/gui/gpx.cc | 4 +- gpsbabel/gui/makesetup.bat | 25 +++--- gpsbabel/gui/setup.iss | 170 ++++++++++++++++++------------------- gpsbabel/gui/setup.iss.in | 6 +- 8 files changed, 131 insertions(+), 129 deletions(-) diff --git a/gpsbabel/GPSBabel.pro b/gpsbabel/GPSBabel.pro index 2756f6cbf..0db9f93e8 100644 --- a/gpsbabel/GPSBabel.pro +++ b/gpsbabel/GPSBabel.pro @@ -258,7 +258,7 @@ win32 { } SOURCES += gbser_win.cc JEEPS += jeeps/gpsusbwin.cc - LIBS += setupapi.lib hid.lib + LIBS += "C:/Program Files/Windows Kits/8.0/Lib/win8/um/x86/setupapi.lib" "C:/Program Files/Windows Kits/8.0/Lib/win8/um/x86/hid.lib" } win32-msvc*{ diff --git a/gpsbabel/configure b/gpsbabel/configure index 682163f31..a897abae0 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GPSBabel 1.4.4. +# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.0-beta20140214. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GPSBabel' PACKAGE_TARNAME='gpsbabel' -PACKAGE_VERSION='1.4.4' -PACKAGE_STRING='GPSBabel 1.4.4' +PACKAGE_VERSION='1.5.0-beta20140214' +PACKAGE_STRING='GPSBabel 1.5.0-beta20140214' PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' PACKAGE_URL='' @@ -1283,7 +1283,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GPSBabel 1.4.4 to adapt to many kinds of systems. +\`configure' configures GPSBabel 1.5.0-beta20140214 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1349,7 +1349,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GPSBabel 1.4.4:";; + short | recursive ) echo "Configuration of GPSBabel 1.5.0-beta20140214:";; esac cat <<\_ACEOF @@ -1449,7 +1449,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GPSBabel configure 1.4.4 +GPSBabel configure 1.5.0-beta20140214 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1765,7 +1765,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GPSBabel $as_me 1.4.4, which was +It was created by GPSBabel $as_me 1.5.0-beta20140214, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2113,16 +2113,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -DOCVERSION=`echo $PACKAGE_VERSION` - -DOCVERSION=1.4.4 +# YYYYMMDD, please, if beta, i.e. "-beta20060413" +DOCVERSION=development -# Increase GBBUILD for a new release -GBBUILD=24 -# YYYYMMDD, please, if beta, i.e. "-beta20060413" -# PACKAGE_RELEASE="-beta20120114" -# DOCVERSION=development +# Increase GBBUILD for a new release (why? Where is this ever used?) +GBBUILD=25 +# PACKAGE_RELEASE="-beta20140216" cat >>confdefs.h <<_ACEOF #define PACKAGE_RELEASE "$PACKAGE_RELEASE" @@ -5478,7 +5475,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GPSBabel $as_me 1.4.4, which was +This file was extended by GPSBabel $as_me 1.5.0-beta20140214, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5540,7 +5537,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GPSBabel config.status 1.4.4 +GPSBabel config.status 1.5.0-beta20140214 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index abcb5def0..9f8b293f9 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -3,17 +3,17 @@ AC_PREREQ(2.59) -AC_INIT(GPSBabel, 1.4.4, BUG-REPORT-ADDRESS) -DOCVERSION=`echo $PACKAGE_VERSION` - -DOCVERSION=1.4.4 +#AC_INIT(GPSBabel, 1.4.4, BUG-REPORT-ADDRESS) +#DOCVERSION=1.4.4 +#PACKAGE_RELEASE= +AC_INIT(GPSBabel, 1.5.0-beta20140214, BUG-REPORT-ADDRESS) +# YYYYMMDD, please, if beta, i.e. "-beta20060413" +DOCVERSION=development -# Increase GBBUILD for a new release -GBBUILD=24 -# YYYYMMDD, please, if beta, i.e. "-beta20060413" -# PACKAGE_RELEASE="-beta20120114" -# DOCVERSION=development +# Increase GBBUILD for a new release (why? Where is this ever used?) +GBBUILD=25 +# PACKAGE_RELEASE="-beta20140216" AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.]) AC_SUBST(PACKAGE_RELEASE) diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h index 09b651f49..6f5d228f6 100644 --- a/gpsbabel/gbversion.h +++ b/gpsbabel/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.4.4" -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.4.4" +#define VERSION "1.5.0-beta20140214" +#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development" diff --git a/gpsbabel/gui/gpx.cc b/gpsbabel/gui/gpx.cc index 86e6da4c4..a634733d3 100644 --- a/gpsbabel/gui/gpx.cc +++ b/gpsbabel/gui/gpx.cc @@ -73,7 +73,7 @@ public: QList stateStack; virtual bool startElement (const QString & , - const QString & localName, const QString & qName, + const QString & localName, const QString &, const QXmlAttributes & atts ) { if (localName == "wpt") { @@ -135,7 +135,7 @@ public: virtual bool endElement (const QString & , const QString & localName, - const QString & qName) + const QString &) { if (localName == "wpt") { state = stateStack.takeLast(); diff --git a/gpsbabel/gui/makesetup.bat b/gpsbabel/gui/makesetup.bat index 27f93c8de..ebe3039ef 100644 --- a/gpsbabel/gui/makesetup.bat +++ b/gpsbabel/gui/makesetup.bat @@ -4,29 +4,34 @@ rem Copy the Qt stuff into a local directory. The Inno Setup compiler rem cannot handle %QTDIR environment variable in the source file rem specification +echo on rd /q /s qtdir mkdir qtdir mkdir qtdir\bin mkdir qtdir\translations mkdir qtdir\plugins mkdir qtdir\plugins\imageformats +mkdir qtdir\plugins\platforms mkdir qtdir\mingw rem Basic Qt runtime DLLs -if "%QTDIR%"=="" call \QtSDK\Desktop\Qt\4.7.4\mingw\bin\qtenv2.bat -copy %QTDIR%\bin\QtCore4.dll qtdir\bin -copy %QTDIR%\bin\QtGui4.dll qtdir\bin -copy %QTDIR%\bin\QtWebkit4.dll qtdir\bin -copy %QTDIR%\bin\QtXml4.dll qtdir\bin -copy %QTDIR%\bin\QtNetwork4.dll qtdir\bin -copy %QTDIR%\bin\mingwm10.dll qtdir\bin +rem if "%QTDIR%"=="" call \QtSDK\Desktop\Qt\4.7.4\mingw\bin\qtenv2.bat +if "%QTDIR%"=="" call \Qt\Qt5.2.1\5.2.1\mingw48_32\bin\qtenv2.bat +if "%QTDIR%"=="" set QTDIR=\Qt\Qt5.2.1\5.2.1\mingw48_32 +copy %QTDIR%\bin\Qt5Core.dll qtdir\bin +copy %QTDIR%\bin\Qt5Gui.dll qtdir\bin +copy %QTDIR%\bin\Qt5Webkit.dll qtdir\bin +copy %QTDIR%\bin\Qt5Xml.dll qtdir\bin +copy %QTDIR%\bin\Qt5Network.dll qtdir\bin +rem copy %QTDIR%\bin\mingwm10.dll qtdir\bin copy %QTDIR%\bin\libgcc_s_dw2-1.dll qtdir\bin -copy %QTDIR%\bin\phonon4.dll qtdir\bin +rem copy %QTDIR%\bin\phonon.dll qtdir\bin rem Image format plugins needed at runtime, but not debug verions xcopy %QTDIR%\plugins\imageformats qtdir\plugins\imageformats -del qtdir\plugins\imageformats\*d4*.dll -del qtdir\plugins\imageformats\lib*d4*.a +xcopy %QTDIR%\plugins\platforms qtdir\plugins\platforms +rem del qtdir\plugins\imageformats\*d4*.dll +rem del qtdir\plugins\imageformats\lib*d4*.a rem Mingw runtime support copy %QTDIR%\..\mingw\bin\mingwm10.dll qtdir\mingw diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss index 9a7748ecf..4f78e1298 100755 --- a/gpsbabel/gui/setup.iss +++ b/gpsbabel/gui/setup.iss @@ -1,85 +1,85 @@ -; -; NOTE: setup.iss is generated from setup.iss.in via autoconf. -; The generated setup.iss is checked in to help keep the version numbers -; synchronized. -; -; Script for generating installation setup program for GPSBabel -; Uses the Inno setup compiler. Typically used from the command -; line "makesetup.bat" which copies QT system files which -; the Innosetup compiler cannot handle. -; -; So it is not a good idea to run this file from the Inno Setup GUI. - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} -AppName=GPSBabel -AppVerName=GPSBabel 1.4.4 -AppPublisher=GPSBabel -AppPublisherURL=http://www.gpsbabel.org -AppSupportURL=http://www.gpsbabel.org -AppUpdatesURL=http://www.gpsbabel.org -DefaultDirName={pf}\GPSBabel -DefaultGroupName=GPSBabel -OutputDir=release -OutputBaseFilename=GPSBabel-1.4.4-Setup -SetupIconFile=images\babel2.ico -Compression=lzma -SolidCompression=yes -LicenseFile=COPYING.txt - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -; This isn't as wreckless as it seems; these directories are populated on a -; controlled way by the batch file. -Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion -Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs - -Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion -Source: qt.conf; DestDir: "{app}"; Flags: ignoreversion - -Source: release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion -Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion -Source: release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion -; Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs - -; Translation strings extracted from source code. Include it in the dist -; so that users can translate if they want to. -; Source: gpsbabel_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion -; Source: gpsbabelfe_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion - -; Compiled translation strings that are used at runtime. -; Source: gpsbabel_*.qm; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe*.qm; DestDir: "{app}\translations"; Flags: ignoreversion - -; Now translations from Qt's own UI stuff. -Source: qtdir\translations\*; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs - -; Miscellaneous -Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion -; Source: AUTHORS; DestDir: {app}; Flags: ignoreversion -; Source: README.contrib; DestDir: {app}; Flags: ignoreversion -; Source: README.gui; DestDir: {app}; Flags: ignoreversion - - -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe" -Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon - -[Run] -Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent - -[Registry] -Root: HKCU; Subkey: "Software\GPSBabel"; Flags: uninsdeletekeyifempty -Root: HKCU; Subkey: "Software\GPSBabel\GPSBabel"; Flags: uninsdeletekey -Root: HKCU; Subkey: "Software\GPSBabel\GPSBabelFE"; Flags: uninsdeletekey - +; +; NOTE: setup.iss is generated from setup.iss.in via autoconf. +; The generated setup.iss is checked in to help keep the version numbers +; synchronized. +; +; Script for generating installation setup program for GPSBabel +; Uses the Inno setup compiler. Typically used from the command +; line "makesetup.bat" which copies QT system files which +; the Innosetup compiler cannot handle. +; +; So it is not a good idea to run this file from the Inno Setup GUI. + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} +AppName=GPSBabel +AppVerName=GPSBabel 1.5.0 +AppPublisher=GPSBabel +AppPublisherURL=http://www.gpsbabel.org +AppSupportURL=http://www.gpsbabel.org +AppUpdatesURL=http://www.gpsbabel.org +DefaultDirName={pf}\GPSBabel +DefaultGroupName=GPSBabel +OutputDir=release +OutputBaseFilename=GPSBabel-1.5.0-Setup +SetupIconFile=images\babel2.ico +Compression=lzma +SolidCompression=yes +LicenseFile=COPYING.txt + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +; This isn't as wreckless as it seems; these directories are populated on a +; controlled way by the batch file. +Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion +Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs + +Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion +Source: qt.conf; DestDir: "{app}"; Flags: ignoreversion + +Source: \gpsbabel\gui\release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion +;Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion +Source: \gpsbabel\gpsbabel\release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion +; Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs + +; Translation strings extracted from source code. Include it in the dist +; so that users can translate if they want to. +; Source: gpsbabel_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion +; Source: gpsbabelfe_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion + +; Compiled translation strings that are used at runtime. +; Source: gpsbabel_*.qm; DestDir: "{app}\translations"; Flags: ignoreversion +Source: gpsbabelfe*.qm; DestDir: "{app}\translations"; Flags: ignoreversion + +; Now translations from Qt's own UI stuff. +Source: qtdir\translations\*; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs + +; Miscellaneous +Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion +; Source: AUTHORS; DestDir: {app}; Flags: ignoreversion +; Source: README.contrib; DestDir: {app}; Flags: ignoreversion +; Source: README.gui; DestDir: {app}; Flags: ignoreversion + + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe" +Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon + +[Run] +Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent + +[Registry] +Root: HKCU; Subkey: "Software\GPSBabel"; Flags: uninsdeletekeyifempty +Root: HKCU; Subkey: "Software\GPSBabel\GPSBabel"; Flags: uninsdeletekey +Root: HKCU; Subkey: "Software\GPSBabel\GPSBabelFE"; Flags: uninsdeletekey + diff --git a/gpsbabel/gui/setup.iss.in b/gpsbabel/gui/setup.iss.in index a5f9d6c37..b5b420662 100755 --- a/gpsbabel/gui/setup.iss.in +++ b/gpsbabel/gui/setup.iss.in @@ -45,9 +45,9 @@ Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recurs Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion Source: qt.conf; DestDir: "{app}"; Flags: ignoreversion -Source: release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion -Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion -Source: release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion +Source: \gpsbabel\gui\release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion +;Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion +Source: \gpsbabel\gpsbabel\release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion ; Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs ; Translation strings extracted from source code. Include it in the dist -- 2.30.2